diff options
| author | bunnei <bunneidev@gmail.com> | 2023-03-18 06:14:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-18 06:14:29 +0100 |
| commit | 889454f9bff3cb9b2034bba7f5961f77235eac82 (patch) | |
| tree | 44d2568ae2ed7e9d667b62b216b66da04bd80e56 | |
| parent | Merge pull request #9953 from german77/amiibo_crc (diff) | |
| parent | gpu_thread: Use bounded queue (diff) | |
| download | yuzu-889454f9bff3cb9b2034bba7f5961f77235eac82.tar yuzu-889454f9bff3cb9b2034bba7f5961f77235eac82.tar.gz yuzu-889454f9bff3cb9b2034bba7f5961f77235eac82.tar.bz2 yuzu-889454f9bff3cb9b2034bba7f5961f77235eac82.tar.lz yuzu-889454f9bff3cb9b2034bba7f5961f77235eac82.tar.xz yuzu-889454f9bff3cb9b2034bba7f5961f77235eac82.tar.zst yuzu-889454f9bff3cb9b2034bba7f5961f77235eac82.zip | |
| -rw-r--r-- | src/video_core/gpu_thread.cpp | 3 | ||||
| -rw-r--r-- | src/video_core/gpu_thread.h | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/video_core/gpu_thread.cpp b/src/video_core/gpu_thread.cpp index 050b11874..f52f9e28f 100644 --- a/src/video_core/gpu_thread.cpp +++ b/src/video_core/gpu_thread.cpp @@ -32,7 +32,8 @@ static void RunThread(std::stop_token stop_token, Core::System& system, VideoCore::RasterizerInterface* const rasterizer = renderer.ReadRasterizer(); while (!stop_token.stop_requested()) { - CommandDataContainer next = state.queue.PopWait(stop_token); + CommandDataContainer next; + state.queue.Pop(next, stop_token); if (stop_token.stop_requested()) { break; } diff --git a/src/video_core/gpu_thread.h b/src/video_core/gpu_thread.h index 90bcb5958..43940bd6d 100644 --- a/src/video_core/gpu_thread.h +++ b/src/video_core/gpu_thread.h @@ -10,8 +10,8 @@ #include <thread> #include <variant> +#include "common/bounded_threadsafe_queue.h" #include "common/polyfill_thread.h" -#include "common/threadsafe_queue.h" #include "video_core/framebuffer_config.h" namespace Tegra { @@ -97,7 +97,7 @@ struct CommandDataContainer { /// Struct used to synchronize the GPU thread struct SynchState final { - using CommandQueue = Common::MPSCQueue<CommandDataContainer, true>; + using CommandQueue = Common::MPSCQueue<CommandDataContainer>; std::mutex write_lock; CommandQueue queue; u64 last_fence{}; |